Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 22:04:10 +0000 (22:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 22:04:10 +0000 (22:04 +0000)

Trivial merge